Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 1 Feb 2011 07:19:22 +0000 (23:19 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 1 Feb 2011 07:19:22 +0000 (23:19 -0800)
commit1e7b770b695c897e16ed50dee0dd7aae4d00c367
tree627fa2b944ed55f109e2f5fca94cfabca8b4bff8
parenta56a74520b8ddd6c6c3a122a068c57a5803fdbd1
parentb8267ec7bef37ad111372d6d221833ab6d8a01ff
Merge from mainline.